Add LocalSet::enter #4765

gftea · 2022-06-12T21:13:36Z

Motivation

add LocalSet::enter #4736

Solution

LocalSet::enter(&self) -> EnterGuard will set LocalSet's context into TLS CURRENT, and return EnterGuard with a referene to LocalSet itself, the LocalSet reference should outlive EnterGuard.

tokio/src/task/local.rs

…read_local (tokio-rs#4764)

Darksonn

As far as I can tell, we can use Cell rather than RefCell here. When that's possible, then I prefer Cell because it doesn't risk panics.

Besides that, this looks good to me.

gftea · 2022-06-23T12:08:28Z

OK, just to confirm your thoughts, we have to take value out of Cell everytime and set it back, because the Option<Rc<Context>> is not Copy, cannot use Cell::get

should we set context before panic?

    fn release(&self, task: &Task<Self>) -> Option<Task<Self>> {
        CURRENT.with(|maybe_cx| match maybe_cx.take() {
            None => panic!("scheduler context missing"),
            Some(cx) => {
                assert!(cx.shared.ptr_eq(self));
                maybe_cx.set(Some(cx.clone()));
                cx.owned.remove(task)
            }
        })
    }

draft solution : maybe set back context before match

    fn release(&self, task: &Task<Self>) -> Option<Task<Self>> {
        CURRENT.with(|maybe_cx| {
            let ctx = maybe_cx.take();
            maybe_cx.set(ctx.clone());
            match ctx {
                None => panic!("scheduler context missing"),
                Some(cx) => {
                    assert!(cx.shared.ptr_eq(self));
                    cx.owned.remove(task)
                }
            }
        })
    }

tokio/src/task/local.rs

gftea · 2022-06-29T08:31:32Z

The two failure in CI seems due to server environment issue

Darksonn · 2022-06-29T08:32:42Z

Please see #4794 for those.

Darksonn · 2022-06-29T08:59:34Z

If you merge master, then CI should pass.

gftea · 2022-06-29T10:48:28Z

how to trigger rerun of the failed job in CI?

tokio/src/task/local.rs

Co-authored-by: Alice Ryhl <aliceryhl@google.com>

tokio/src/task/local.rs

Co-authored-by: Alice Ryhl <aliceryhl@google.com>

Darksonn

LGTM

This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [tokio](https://tokio.rs) ([source](https://github.com/tokio-rs/tokio)) | dependencies | minor | `1.20.1` -> `1.21.0` | | [tokio](https://tokio.rs) ([source](https://github.com/tokio-rs/tokio)) | dev-dependencies | minor | `1.20.1` -> `1.21.0` | --- ### Release Notes <details> <summary>tokio-rs/tokio</summary> ### [`v1.21.0`](https://github.com/tokio-rs/tokio/releases/tag/tokio-1.21.0) [Compare Source](tokio-rs/tokio@tokio-1.20.1...tokio-1.21.0) ##### 1.21.0 (September 2, 2022) This release is the first release of Tokio to intentionally support WASM. The `sync,macros,io-util,rt,time` features are stabilized on WASM. Additionally the wasm32-wasi target is given unstable support for the `net` feature. ##### Added - net: add `device` and `bind_device` methods to TCP/UDP sockets ([#4882]) - net: add `tos` and `set_tos` methods to TCP and UDP sockets ([#4877]) - net: add security flags to named pipe `ServerOptions` ([#4845]) - signal: add more windows signal handlers ([#4924]) - sync: add `mpsc::Sender::max_capacity` method ([#4904]) - sync: implement Weak version of `mpsc::Sender` ([#4595]) - task: add `LocalSet::enter` ([#4765]) - task: stabilize `JoinSet` and `AbortHandle` ([#4920]) - tokio: add `track_caller` to public APIs ([#4805], [#4848], [#4852]) - wasm: initial support for `wasm32-wasi` target ([#4716]) ##### Fixed - miri: improve miri compatibility by avoiding temporary references in `linked_list::Link` impls ([#4841]) - signal: don't register write interest on signal pipe ([#4898]) - sync: add `#[must_use]` to lock guards ([#4886]) - sync: fix hang when calling `recv` on closed and reopened broadcast channel ([#4867]) - task: propagate attributes on task-locals ([#4837]) ##### Changed - fs: change panic to error in `File::start_seek` ([#4897]) - io: reduce syscalls in `poll_read` ([#4840]) - process: use blocking threadpool for child stdio I/O ([#4824]) - signal: make `SignalKind` methods const ([#4956]) ##### Internal changes - rt: extract `basic_scheduler::Config` ([#4935]) - rt: move I/O driver into `runtime` module ([#4942]) - rt: rename internal scheduler types ([#4945]) ##### Documented - chore: fix typos and grammar ([#4858], [#4894], [#4928]) - io: fix typo in `AsyncSeekExt::rewind` docs ([#4893]) - net: add documentation to `try_read()` for zero-length buffers ([#4937]) - runtime: remove incorrect panic section for `Builder::worker_threads` ([#4849]) - sync: doc of `watch::Sender::send` improved ([#4959]) - task: add cancel safety docs to `JoinHandle` ([#4901]) - task: expand on cancellation of `spawn_blocking` ([#4811]) - time: clarify that the first tick of `Interval::tick` happens immediately ([#4951]) ##### Unstable - rt: add unstable option to disable the LIFO slot ([#4936]) - task: fix incorrect signature in `Builder::spawn_on` ([#4953]) - task: make `task::Builder::spawn*` methods fallible ([#4823]) [#4595]: tokio-rs/tokio#4595 [#4716]: tokio-rs/tokio#4716 [#4765]: tokio-rs/tokio#4765 [#4805]: tokio-rs/tokio#4805 [#4811]: tokio-rs/tokio#4811 [#4823]: tokio-rs/tokio#4823 [#4824]: tokio-rs/tokio#4824 [#4837]: tokio-rs/tokio#4837 [#4840]: tokio-rs/tokio#4840 [#4841]: tokio-rs/tokio#4841 [#4845]: tokio-rs/tokio#4845 [#4848]: tokio-rs/tokio#4848 [#4849]: tokio-rs/tokio#4849 [#4852]: tokio-rs/tokio#4852 [#4858]: tokio-rs/tokio#4858 [#4867]: tokio-rs/tokio#4867 [#4877]: tokio-rs/tokio#4877 [#4882]: tokio-rs/tokio#4882 [#4886]: tokio-rs/tokio#4886 [#4893]: tokio-rs/tokio#4893 [#4894]: tokio-rs/tokio#4894 [#4897]: tokio-rs/tokio#4897 [#4898]: tokio-rs/tokio#4898 [#4901]: tokio-rs/tokio#4901 [#4904]: tokio-rs/tokio#4904 [#4920]: tokio-rs/tokio#4920 [#4924]: tokio-rs/tokio#4924 [#4928]: tokio-rs/tokio#4928 [#4935]: tokio-rs/tokio#4935 [#4936]: tokio-rs/tokio#4936 [#4937]: tokio-rs/tokio#4937 [#4942]: tokio-rs/tokio#4942 [#4945]: tokio-rs/tokio#4945 [#4951]: tokio-rs/tokio#4951 [#4953]: tokio-rs/tokio#4953 [#4956]: tokio-rs/tokio#4956 [#4959]: tokio-rs/tokio#4959 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).  Co-authored-by: cabr2-bot <cabr2.help@gmail.com> Reviewed-on: https://codeberg.org/Calciumdibromid/CaBr2/pulls/1532 Reviewed-by: crapStone <crapstone@noreply.codeberg.org> Co-authored-by: Calciumdibromid Bot <cabr2_bot@noreply.codeberg.org> Co-committed-by: Calciumdibromid Bot <cabr2_bot@noreply.codeberg.org>

Add LocalSet::enter (tokio-rs#4736)

9853878

Darksonn added A-tokio Area: The main tokio crate M-task Module: tokio/task labels Jun 13, 2022

add Debug trait implementation for EnterGuard (tokio-rs#4736)

a457a3a

hawkw reviewed Jun 13, 2022

View reviewed changes

tokio/src/task/local.rs Outdated Show resolved Hide resolved

fix format by rustfmt (tokio-rs#4736)

8edb09e

Darksonn reviewed Jun 15, 2022

View reviewed changes

tokio/src/task/local.rs Outdated Show resolved Hide resolved

reexport LocalEnterGuard (tokio-rs#4736)

a0431cd

Darksonn reviewed Jun 16, 2022

View reviewed changes

tokio/src/task/local.rs Outdated Show resolved Hide resolved

gftea and others added 2 commits June 16, 2022 14:28

Merge branch 'tokio-rs:master' into localset_enter_4736

a2007ac

Use thread_local to reference LocalSet's context instead of scoped_th…

ea414c3

…read_local (tokio-rs#4764)

Darksonn reviewed Jun 23, 2022

View reviewed changes

Darksonn reviewed Jun 24, 2022

View reviewed changes

tokio/src/task/local.rs Outdated Show resolved Hide resolved

gftea added 4 commits June 28, 2022 20:04

wrap thread_local in Cell instead RefCell (tokio-rs#4764)

720a8de

rebase from tokio

a513ba2

merge into localset_enter_4736 and solve conflicts from 4770

50fb7a1

fix compilation error in CI

8045d5d

Merge 'upstream/master' into 'gftea/localset_enter_4736'

75e8d11

Darksonn reviewed Jun 29, 2022

View reviewed changes

tokio/src/task/local.rs Outdated Show resolved Hide resolved

tokio/src/task/local.rs Outdated Show resolved Hide resolved

gftea and others added 2 commits June 29, 2022 15:19

Update tokio/src/task/local.rs

702a4ca

Co-authored-by: Alice Ryhl <aliceryhl@google.com>

task: implement debug for enter guard (tokio-rs#4736)

3564197

Darksonn reviewed Jun 30, 2022

View reviewed changes

tokio/src/task/local.rs Outdated Show resolved Hide resolved

tokio/src/task/local.rs Show resolved Hide resolved

carllerche mentioned this pull request Jul 5, 2022

rt: provide options to configure unhandled panic behavior #4516

Open

3 tasks

Update comments tokio/src/task/local.rs

a0d81b8

Co-authored-by: Alice Ryhl <aliceryhl@google.com>

Darksonn approved these changes Jul 13, 2022

View reviewed changes

Darksonn merged commit 14fca34 into tokio-rs:master Jul 13, 2022

Darksonn mentioned this pull request Sep 1, 2022

chore: prepare Tokio v1.21.0 #4967

Merged

Darksonn changed the title ~~Add LocalSet::enter (#4736)~~ Add LocalSet::enter Sep 5, 2022

Darksonn mentioned this pull request Sep 5, 2022

Tokio LocalSet can no longer be stored in thread_local #4973

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add LocalSet::enter #4765

Add LocalSet::enter #4765

gftea commented Jun 12, 2022

Darksonn left a comment •

edited

Loading

gftea commented Jun 23, 2022 •

edited

Loading

gftea commented Jun 29, 2022

Darksonn commented Jun 29, 2022

Darksonn commented Jun 29, 2022

gftea commented Jun 29, 2022

Darksonn left a comment

Add LocalSet::enter #4765

Add LocalSet::enter #4765

Conversation

gftea commented Jun 12, 2022

Motivation

Solution

Darksonn left a comment • edited Loading

Choose a reason for hiding this comment

gftea commented Jun 23, 2022 • edited Loading

gftea commented Jun 29, 2022

Darksonn commented Jun 29, 2022

Darksonn commented Jun 29, 2022

gftea commented Jun 29, 2022

Darksonn left a comment

Choose a reason for hiding this comment

Darksonn left a comment •

edited

Loading

gftea commented Jun 23, 2022 •

edited

Loading